From 75412cec51ad6ae3806c09555e396c58b538d48e Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Fri, 7 Oct 2011 22:54:21 -0500 Subject: [PATCH] Pass the correct crt-dir to ./configure for multiarch. Thanks to Sven Joachim for the report and the patch, and thanks to Philipp Kern for the 23.3+1-1.1 NMU which included the patch. Closes: #629567 --- debian/rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index ef19af7b3a1..9dc28d0164c 100755 --- a/debian/rules +++ b/debian/rules @@ -166,6 +166,8 @@ else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif +deb_host_multiarch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + LDFLAGS := -g CFLAGS := -DDEBIAN -g @@ -433,6 +435,9 @@ confflags += --mandir=/usr/share/man confflags += --with-pop=yes confflags += --enable-locallisppath=$(local_lpath) +# multiarch compatibility +confflags += --with-crt-dir=/usr/lib/$(deb_host_multiarch) + # x configure flags confflags_x := $(confflags) confflags_x += --with-x=yes -- 2.30.2